Merge cherrypicks of ['googleplex-android-review.googlesource.com/34858978', 'googleplex-android-review.googlesource.com/35601803', 'googleplex-android-review.googlesource.com/35601643'] into tm-platform-release. Change-Id: Ia3c18a7577bd509d52b97955d9bc3968354bbe3c