Merge cherrypicks of [19139107, 19121096, 19151105, 19152590, 19033207, 19168066] into tm-release.

Change-Id: I2dc4347c75c836d196a2f13050552ff7fd4429bc