Merge bed61576e3c64b979e589ee5338567f2b0882d02 on remote branch

Change-Id: Ifd8903c5ee1cf79fa8492bc87b4047342cb6d478