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