Merge cherrypicks of [19065229] into tm-release.

Change-Id: I1b21fe763a82c3d31a2edfa4068368a89f6e8702