Merge c00c8508cab57a9d56e0356ee80986cf8084c322 on remote branch

Change-Id: Iadebb38b7c0110c8e67f45336e42b1d81519c861