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