Merge 68a594cb4507e341e5ba526929c64f22e3a67f71 on remote branch

Change-Id: I611b6bc5eab4d3b8193119b0468cc2d6fd603a95