Merge cherrypicks of ['googleplex-android-review.googlesource.com/32875067', 'googleplex-android-review.googlesource.com/34151218'] into udc-platform-release.

Change-Id: I345c791fbee31763ec3706ed1ff7074193e7ac01