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