Merge 4c420e7f34bc60e68543605301517f9e39759ec0 on remote branch

Change-Id: I0a7258b9e2cfa4ee22498bc763826de314d0b233