Merge 4a193fa11cad085eb3dab452e877a2f6955f5aac on remote branch

Change-Id: I49ff39e786d323f78201af689fd0cdf046169431