Merge cherrypicks of [16671714] into tm-release.

Change-Id: Ia0911246107bdf14c40c07c2e7fd2f626b999f14