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