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