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

Change-Id: I5415586334cb6e5718e7869909a2afdee4cdaaed