Merge cherrypicks of ['googleplex-android-review.googlesource.com/26094789', 'googleplex-android-review.googlesource.com/25989695'] into udc-d2-release. Change-Id: I356d054be860bb468a563f1b496a05c335897a5c