Merge c2619454b9affc83ec0f301693409b1b6b092220 on remote branch

Change-Id: I86ecf88164422e663d3c3cfbb8621d7dd26cb952