Merge cherrypicks of ['googleplex-android-review.googlesource.com/24408134', 'googleplex-android-review.googlesource.com/24408135'] into sparse-10685236-L22000000962658982.
SPARSE_CHANGE: I3d98813e9b236d583bc1bedeca1d5d0b26485c38
SPARSE_CHANGE: I49b714ba9f9d0e6d4f7fbe17e3a21f0b5a9e41d1

Change-Id: I9e772bf05be81f31599023034bfa3bc143680c62