Merge cherrypicks of [16671714] into tm-release.

Change-Id: I02fbd6b4db26662f52abb91d89d851cc117e463f