Merge 3fbde46dcb2168534f0d745a529a3286be19e4c6 on remote branch

Change-Id: I9abf3410c18c1399eb72d52174268550ed343b47