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

Change-Id: Ie47fa060d5a6f679458d0ea4c634627a2f96f378