Merge cherrypicks of ['googleplex-android-review.googlesource.com/23722149', 'googleplex-android-review.googlesource.com/23722150'] into sparse-10335664-L85300000961746380.
SPARSE_CHANGE: Ia22f7922e929876d65b056f10eef8310ea645714
SPARSE_CHANGE: I50dcfaf2d256de0951749ae9c3fa0b8018eafea5

Change-Id: Ia9f8bc6894e62abf3f5c43eadf5fefd702c4d137