Merge 610bdb8febbd4488a5d1373359d9706a3d6521d2 on remote branch

Change-Id: I470ecbbaf06a35e31715f6c327403612f3c95914