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