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