Merge 0a77bd751fc82bf1306bb6e806152446f3afea34 on remote branch

Change-Id: I92c93e8aa2b6c3ad38c58e1969097a877b3b39a4