Merge 0c2047899ba644b42b7c4c861e3d885cbbb46acf on remote branch

Change-Id: Ibca91823f53f8c93991ff08daa8c2c870d8aad0c