Merge cherrypicks of ['googleplex-android-review.googlesource.com/25176087'] into udc-release. Change-Id: Icc861cef6eb9a201e48e4f54dddd54001263c851