Merge 1053b923c54ffba83fac0f42d089c9a738519651 on remote branch

Change-Id: I6f9bcce6f95d9dcf2920c67174da47f9fa097bb8