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

Change-Id: Ifd8c01bef856eafa3e8e7160e9fbb112e96e1acb