Merge cherrypicks of ['googleplex-android-review.googlesource.com/36016437', 'googleplex-android-review.googlesource.com/36999446'] into udc-platform-release. Change-Id: Ic7376a82149d51759a0807a2463bbc6b83e6b777