Merge cherrypicks of [19432064, 19432065] into tm-release.

Change-Id: I8a9ecd80650fbc5de83b7d6d04e10ad729fd8f6c