Merge 1b0e5bfe5b4cba1b0c809648ed3be95d5e8527f7 on remote branch

Change-Id: Ia036296c263cb5744abd6bd55a0b6414be482edb