Merge 5b77aa04ddcc62341788fdd4bb3d7525eaef0ef2 on remote branch

Change-Id: I4408dba5ed0e2e747394489064cd6c7d65961fca