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

Change-Id: Ibc702ceef7352ca1f46361d59bd84aa7fe265542