Merge 25b0180ec2f7f7eac845d1a32beb0a84173688b6 on remote branch

Change-Id: I53ac6d80c4cf56a2b788d0c4633f4fe8fbf3b1d9