Merge cherrypicks of [19214732] into tm-release.

Change-Id: I620702fa3a3bd82ad17a9cef6d50aad273ce3803