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