Merge cherrypicks of [19085836] into tm-release.

Change-Id: Ib35bf09268bc237aa755c0c96ab64bf7289d1d74