Merge cherrypicks of ['googleplex-android-review.googlesource.com/24077613', 'googleplex-android-review.googlesource.com/25102101', 'googleplex-android-review.googlesource.com/25064728', 'googleplex-android-review.googlesource.com/23262449', 'googleplex-android-review.googlesource.com/24708693', 'googleplex-android-review.googlesource.com/25369997'] into rvc-platform-release.

Change-Id: I142162ace2d0edb4a7fbc487cf9295f6a4a2886a