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

Change-Id: I4bcb05280ddeccd87343cda162b4c4bf0d813073