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