Merge cherrypicks of [19167088, 19210906] into tm-release.

Change-Id: Ide3acc427653b7322e0634713538acafd3e6caad