Merge 46434034c968a82f74d04cf71f95ceee9a0a6e61 on remote branch

Change-Id: Ic539d404176b2ca50bd615f852438d281f878300