Merge cherrypicks of ['googleplex-android-review.googlesource.com/27574478'] into 24D1-release. Change-Id: I624fd3082b7e883e8a746686edf50a0d2df78c12