Merge 8cd619b7f77a5fef936f78f64b87b695ac1c3572 on remote branch

Change-Id: Ifc4dac9dfbd0a676aaa1621a9e30e9a4d83bffd0