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