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