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

Change-Id: I76185497923dd5bf401048ef841013524d422636