Change-Id: I04dbe0c08f0106834661606bfd65da252637b8f4 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>