Merge 7da8c85357dc35c763c30518a1d88a869a18f5c5 on remote branch

Change-Id: Ia84c779070026e85eb205cd9fddd3626b4b1019a