Merge cherrypicks of ['googleplex-android-review.googlesource.com/26227893', 'googleplex-android-review.googlesource.com/26227894'] into sparse-11539328-L23200030002362131.
SPARSE_CHANGE: I20c79baccad74e37a025ad8fbf3a478acceb63a8
SPARSE_CHANGE: Iaa6859d792626a0f5b3ce1b92521b380421c52ab

Change-Id: I7781615510f25a1a727229aa16931f9992526db3