Merge 47b5b9455cb3e1c6557c6300445303e6a64b41a3 on remote branch

Change-Id: Iac58b1c447112840b2a0e755623833302d2681ed