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