Merge cherrypicks of [19746893] into tm-d1-release.

Change-Id: I5fe8b20e6b48827dbfac28ff3e9dcd408c2b7104