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