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

Change-Id: I11fc2d04a445dff52a98c9a373bd17d1785d50cb