Merge cherrypicks of [19430786] into tm-release.

Change-Id: I8a0f5f34604275aef7434e2dd5ca09a16567cdad