Merge 63b9af5089ad5ef839c6e46c02bdb54b8198e5f2 on remote branch

Change-Id: I9d80cbe7862b5c7715ad166b01949fc1546bc946