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

Change-Id: I37216d076ec0abcce6e5a58df7e16a3395efe704