Merge cherrypicks of ['googleplex-android-review.googlesource.com/31572648'] into udc-platform-release.

Change-Id: I2e29050f686ff9e958c0d848694061adef36d612