Merge 4ada22379e893d67cfff31195bad899e128ad6a6 on remote branch

Change-Id: If41cca46c7d8b1712350aebb270acfdc032efdd8