Merge cherrypicks of ['googleplex-android-review.googlesource.com/31358031'] into 25D4-release. Change-Id: Ia63d597f978d752cea78d084fec0651622651264