Merge cherrypicks of ['googleplex-android-review.googlesource.com/24028968', 'googleplex-android-review.googlesource.com/24028969'] into sparse-10502572-L39700000962039696.
SPARSE_CHANGE: I9ae6863b0ea5e064c59d9d34c03d33fa1da12fdc
SPARSE_CHANGE: I28491e90847f6aa0c9767b27e1d99190637048b9

Change-Id: I33fcd2357171eb12b72e090924a788f3b5541f97