Merge 3777965465012b6aa626522e0bc7f5e20ae01082 on remote branch

Change-Id: I913b08d4aca434cae5ec2b984587393e9a93600b