Merge 31932a0c318087542a2668a7c3091272fe0a4126 on remote branch

Change-Id: I0e635b3822de7ede6f47cc0ac18b2e51e9e133d3