Merge 8573c4b992d8914c127c1b6ed40f2fab37213c6a on remote branch

Change-Id: Ic0d5f044cf400770c03c4908cbdeeebaafa715ab