Merge 856b86aa6a3b6617aebacbf84057e0e6ffa3bde4 on remote branch

Change-Id: Ib2931111d1c65427d40f01df951ac0960f7d3465