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