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