Merge cherrypicks of ['googleplex-android-review.googlesource.com/24028888', 'googleplex-android-review.googlesource.com/24028889'] into udc-release. Change-Id: I6fcd524beff452d3c0568732353f8a033e80fe06