Merge cherrypicks of [19206328] into tm-release.

Change-Id: I812528d76f37d6c88fdbb44920d25ea74e17c07f