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