Merge 1f54b7cceb81f6cb72b1ecee3c7e0f4bcd698438 on remote branch

Change-Id: Ib20c27026b6d0c901a1adf9e4e6cf69ac3fca23a