Merge 3e40f507538193247522bd12f67a1e8d8b6df8d9 on remote branch

Change-Id: Ic5eaff1a224ea75bf3c615c1809a3da3c3ad3020