Merge 18404a1331ca917cc6980b8ec94b86e007b8fe00 on remote branch

Change-Id: I2a5365dfce29e96df06064f43daf12d0b3b55e1e