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