Merge 47604339566cdc065ee777814ccb6ad9b99989a6 on remote branch

Change-Id: I1c7bbb8822790b38b307af7fcc3fe79b724865b0