Merge cherrypicks of ['googleplex-android-review.googlesource.com/26254719'] into udc-d2-release. Change-Id: I9a7b33b454aeea2961cdf53afade21c34154b259