Merge bf0171cb3aafe347d18d0871c07ed05c36e41bf8 on remote branch

Change-Id: I16c7e82bd41cad899e8b450a2b2c4f4c58535286