Merge 45cc3d34a6cf8c4d480478442d79f0523a443062 on remote branch

Change-Id: I54add0e6d39c211841ac870ab4e66334cd0a99fb