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

Change-Id: I2ab8528f153a400be573225d5ec22f912f697ac6