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

Change-Id: I7bc5087a0d83c2438e8bcfb474ed4c94e2e27786