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