Merge cherrypicks of ['ag/20724733'] into tm-d4-release. Change-Id: I218492a4561d6e14ff9fe3ea4f65c304e7eabd93