Merge cherrypicks of [19199347] into tm-release.

Change-Id: Ic0371b05cee43d5a1c6c29726464a6c663406ab7