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