Merge cherrypicks of ['googleplex-android-review.googlesource.com/28021006', 'googleplex-android-review.googlesource.com/29676541', 'googleplex-android-review.googlesource.com/29789608', 'googleplex-android-review.googlesource.com/30024287'] into tm-platform-release.

Change-Id: Iad76d2d754a03b9ef2372c07095853509865d463