Merge cherrypicks of ['googleplex-android-review.googlesource.com/23447960', 'googleplex-android-review.googlesource.com/24314473', 'googleplex-android-review.googlesource.com/24224609'] into udc-release.

Change-Id: I2f33858065e7f76bc8964949e323eb411700aa04