Merge cherrypicks of [19057927] into tm-release.

Change-Id: I6f4671755cfa61d3b45fad456f08caf19deaeacd