Merge cherrypicks of [19273417, 19267010, 19292028, 19294568, 19296863, 19297073, 19341846, 19341787] into tm-release.

Change-Id: I8b59ebe8d9c667c3568cf4c969bff7b37b6186ae