Merge cherrypicks of [19565636, 19600072, 19570391, 19675492] into tm-d1-release.

Change-Id: I05bfc498ef31b9de90e378bd9269fc51e55acbe7