Merge c4710e196c12ede906276570e3ed8f505bdf8915 on remote branch

Change-Id: Ibeb881eb24f059bfd5586d18ddab0c114a3351ac