Merge 7ef3684ef8eda908a0a99ea03f2ac64aaf2b9a09 on remote branch

Change-Id: I1913a4476ef5381541c0e08bf48f9984889fcb0a