Merge cherrypicks of [18211446] into tm-release.

Change-Id: Ic62b4aed023649cc45701d78a0510d5e0dfce78f