Merge cherrypicks of ['googleplex-android-review.googlesource.com/24372384'] into udc-d1-release. Change-Id: Id426884315a9744fd1153c3c624998dc7bcc3151