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

Change-Id: I3d72c281407f3497d0d4a67fc8f7811a06adced3