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