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