Merge cherrypicks of [19246006] into tm-release.

Change-Id: Iffd4639946c8bf6bf8b6e2ec0465be1e59aeb379