Merge cherrypicks of ['ag/20437814', 'ag/20540194', 'ag/20602135', 'ag/20510866'] into tm-qpr1-release.

Change-Id: I08f56585fd644c8481622ed3e0dd1a9974788f8c