Merge c2fb953c211e74c663d8af8c01c58e3e7b3c6871 on remote branch

Change-Id: I4f166d002237271ff39f619b08f54cda6617e91b