Merge 57d8f7ad6fdfe6d23fff130c16d52f0bcf4c7602 on remote branch

Change-Id: Ic1aaf2b7794595104a1609fd6584c35f86776ac3