Merge b2c72007e038749fd46fb286db6801254a326f39 on remote branch

Change-Id: I4b34101ba987e8a04135f2cfaa0faed7e106e634