Merge cherrypicks of [19524923] into tm-release.

Change-Id: I1c20619f3471adc66e7f7090136f5bd715f3a5ac