Merge 6199afaee6619a4ebf4dafd8d1945c5004a39395 on remote branch

Change-Id: Iee0224a8d5999e9eb05f5d05b5b556c2c273d803