Merge 94422621c488387e142e17005d2e683e786f6088 on remote branch

Change-Id: Icf12551006e8dc706ca49572a13c82a979f34913