Merge cherrypicks of ['googleplex-android-review.googlesource.com/24666066', 'googleplex-android-review.googlesource.com/24240403'] into udc-d1-release. Change-Id: Ieb51f42eaa0bc9881c6c8a782d1a2992c7b05c75