Merge 478628fcdd8ac3fb76ebbd47e7b41e1f5e73e3ba on remote branch

Change-Id: I0cd8c9c441d295d39593cd489f307c01d449fef8