Change-Id: I7ccc55c914b4d5447ad238acfb2ff76cc28d6b23 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>