Merge cherrypicks of [19911937] into tm-release.

Change-Id: I5e47cd207138c76aa4d2ea4f83bb52005777da28