Merge 17f65d4582d6471f5662cc2ed5560601f6259bf5 on remote branch

Change-Id: I4767eef1aaf0f59f198c204f3b25cf2a2dd27954