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

Change-Id: I85eef5906bb293f40d8b0e4b3d1a92a00064b337