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