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