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

Change-Id: I64c2a75726b8f2934f42e0ef7952e7c477e0b7cf