Merge cherrypicks of [19050000] into tm-release.

Change-Id: Ieccad3a1ea9fd1e658a4500e2c069347e9385b8c