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

Change-Id: I57335ae835ceca18b98d4cd9664d7f8c6692876e