Merge cherrypicks of ['ag/20330542'] into tm-qpr1-release.

Change-Id: Ib3e2b47879496b022977de3c46342afbfd9f1137