Change-Id: Ie34157318733a700214ff68708db8127644f65ba Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>