Merge 84c99e289809314609ff5c1bb90b8e9b71676cae on remote branch

Change-Id: Ia122671df19a56fd9b67ccfb55a2299bbb275b55