Merge b220c865e41f468c6e5d43bb4725ddfe6dc483b8 on remote branch

Change-Id: Iae1d881ed7ddad0b8e63133da7162cb3c75b454b