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