Merge 6da6cbb466ecb7d359f6d1157178ed07c04b3c47 on remote branch

Change-Id: Ib16c10af24805ba8dc7800c252b27d0116781fda