Merge e3d6ed0492bb0492eaf99bab3212172df3736e82 on remote branch

Change-Id: I43f24e0c130293d4d6caf81458b7f2edfb2c3346