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