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