Merge 6fce03725dd173cd6009765a9a94ee449c2c2714 on remote branch

Change-Id: I36fd771960a9cb7ac0bf9103f75fa7a1f0c8dbed