Merge cherrypicks of ['googleplex-android-review.googlesource.com/35164123', 'googleplex-android-review.googlesource.com/35602223', 'googleplex-android-review.googlesource.com/36009174'] into tm-platform-release.

Change-Id: I4a8edd3fc1ae885972297b365ea064fed956ee00