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

Change-Id: I9998604f07201613f45df9325b5886c4ab6daa46