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