Merge cherrypicks of ['googleplex-android-review.googlesource.com/24407190'] into udc-release. Change-Id: I8d9cb75ff806a66558d5a14ff38851670536f7ef