Merge b47c04187c12d3243ab56000665a063af70d5cc5 on remote branch

Change-Id: I728caaa1c7193c9d2d248869e964a974ad18c9aa