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