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

Change-Id: I4670959d4341b21c6f7a766ce8416b67800e2e13