Merge cherrypicks of ['googleplex-android-review.googlesource.com/32071724', 'googleplex-android-review.googlesource.com/32959070', 'googleplex-android-review.googlesource.com/32747377', 'googleplex-android-review.googlesource.com/25560359', 'googleplex-android-review.googlesource.com/33474436', 'googleplex-android-review.googlesource.com/33610014', 'googleplex-android-review.googlesource.com/33586289', 'googleplex-android-review.googlesource.com/33921318', 'googleplex-android-review.googlesource.com/33713925', 'googleplex-android-review.googlesource.com/33983951', 'googleplex-android-review.googlesource.com/33670228', 'googleplex-android-review.googlesource.com/33688480', 'googleplex-android-review.googlesource.com/34124703', 'googleplex-android-review.googlesource.com/34110655', 'googleplex-android-review.googlesource.com/34125024', 'googleplex-android-review.googlesource.com/34261721', 'googleplex-android-review.googlesource.com/33974700', 'googleplex-android-review.googlesource.com/33696729', 'googleplex-android-review.googlesource.com/33696730', 'googleplex-android-review.googlesource.com/33914688', 'googleplex-android-review.googlesource.com/33918369', 'googleplex-android-review.googlesource.com/34260758', 'googleplex-android-review.googlesource.com/33986270', 'googleplex-android-review.googlesource.com/34378612', 'googleplex-android-review.googlesource.com/34261522'] into tm-platform-release.
Change-Id: If7dd078db3be7cad624de269ea503d47888d1f12
