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

Change-Id: Ia17383d73efc3aff5c92e19eb8ea166e30ad41f8