Merge cherrypicks of ['ag/20892054'] into tm-qpr2-release.

Change-Id: I83e4cb510accac95e3c2ff2c50177e70c789980d