Merge 66172c953103bdfa0ed4f36f962c64b380ccf019 on remote branch

Change-Id: Ibf0099469c55030f979ee00717f52f076ad10e13