Merge cherrypicks of [19460690, 19458611] into tm-release.

Change-Id: Iba1050ba974e7df88f5c05e44fe6fcb983ac39a8