Merge 966a778cf12253d736f87d763bc61109a28fe850 on remote branch

Change-Id: Ic13362dfa13d3e8acad241240884fd3742e066f9