Merge 9cb05f9446145b990f63eddabe959665783068b0 on remote branch

Change-Id: If3e74144590fdedc779eb0fd2d1a50f99f41745c