Merge cherrypicks of ['googleplex-android-review.googlesource.com/23764937',...

Merge cherrypicks of ['googleplex-android-review.googlesource.com/23764937', 'googleplex-android-review.googlesource.com/23755569', 'googleplex-android-review.googlesource.com/23768596', 'googleplex-android-review.googlesource.com/23791647', 'googleplex-android-review.googlesource.com/23786112'] into udc-release.

Change-Id: Ib641b118126a1cec2dca1e14b5e1bfd744313295