Merge cherrypicks of [19136091, 19272069, 19065708, 19295566, 19416411, 19125209] into tm-release.

Change-Id: I4b2f2da6fe842cca13fa2da440adb6ce29c75ace