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