Merge cherrypicks of [19034945, 19053365] into tm-release.

Change-Id: I6929310a81884fe142fe23fbf54dc01f05a547a9