Merge 9cb75971116874be508a2e323ba8a9786ea779c5 on remote branch

Change-Id: I65cceb1d1a5439574cb897cd9e75e27ef3422115