Merge cherrypicks of ['googleplex-android-review.googlesource.com/23824481', 'googleplex-android-review.googlesource.com/23824863'] into udc-release.

Change-Id: I3d8d8c54a462975ffc224fea0567c0f5dbffbf9e