Merge cherrypicks of ['googleplex-android-review.googlesource.com/31424959', 'googleplex-android-review.googlesource.com/31766493', 'googleplex-android-review.googlesource.com/31816463', 'googleplex-android-review.googlesource.com/32725992'] into 25D4-release. Change-Id: I7d735f63ac13b67b8934695eb0db38f237e302f6