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