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