Merge cherrypicks of [19460750] into tm-release.

Change-Id: I9c082b4a75478d73e56c374f2f94e0c5c08ca30b