Merge 8a75dbdffde9b8f26e1250962b73726a57bac505 on remote branch

Change-Id: I5174036858571064b1eb2307204d84cda5acb09d