Merge cherrypicks of ['googleplex-android-review.googlesource.com/21465508'] into sparse-9595452-L55900000958663479.
SPARSE_CHANGE: Iea66d7782b3365dea827b854783aeddaa5c6699c

Change-Id: I744b6d718affa4026a676f92b76c016b36d07592