Merge 1e3670696e9d6692218e404882b1faa008367687 on remote branch

Change-Id: I2a2f853345445032372d0cbf5b7a593afbd20b25