Merge 1ff0bfd4cc2bb274e7aa7b0dcb41e4140e352c51 on remote branch

Change-Id: I5648ae13a3aa1028de981aefcbcf31cd9772d088