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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/21027159', 'googleplex-android-review.googlesource.com/23770590', 'googleplex-android-review.googlesource.com/23785419', 'googleplex-android-review.googlesource.com/23675944', 'googleplex-android-review.googlesource.com/23772077', 'googleplex-android-review.googlesource.com/23891752', 'googleplex-android-review.googlesource.com/23545766', 'googleplex-android-review.googlesource.com/24126330', 'googleplex-android-review.googlesource.com/24281855', 'googleplex-android-review.googlesource.com/24150805', 'googleplex-android-review.googlesource.com/24026547', 'googleplex-android-review.googlesource.com/24284551', 'googleplex-android-review.googlesource.com/24034687', 'googleplex-android-review.googlesource.com/24300598', 'googleplex-android-review.googlesource.com/24325540', 'googleplex-android-review.googlesource.com/24116150', 'googleplex-android-review.googlesource.com/24239788'] into udc-release.

Change-Id: Iffdcd617b2dbe1c72dc952747a2d80c925cd8feb