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

Change-Id: I28060188d28fec50f926e95e6144d925f6cf2a25