Merge bf0171cb3aafe347d18d0871c07ed05c36e41bf8 on remote branch

Change-Id: I560b3651aec033511b810208023d7099e95a3959