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

Change-Id: I6e55b207ae2c760a2e0ec8d4268ee72eb37d5517