Merge cherrypicks of [19195856] into tm-release.

Change-Id: I9f29e1317114765b1955a60fd946ef0886c40a42