Merge cherrypicks of ['googleplex-android-review.googlesource.com/31941922'] into tm-platform-release.

Change-Id: I12d913ff68ddd66dc85cf4ef6a77f28d5eaff84f