Merge cherrypicks of ['ag/20605566'] into tm-d4-release.

Change-Id: I82de42e18d84cee032576a997171a6c7fd010ec8