Merge cherrypicks of [19300736, 19518944, 19608552, 19537071, 19744515, 19500970, 19816377, 19815899, 19868476] into tm-release.

Change-Id: Idff47e846635e9150c48a7014e9a94424ca8a069