Merge 3561ba4f50af58b841770d18f3f44e9dfc5a7828 on remote branch

Change-Id: I2a40e064f1e33f93384031c8347df81053b87025