Merge cherrypicks of ['googleplex-android-review.googlesource.com/24595435'] into sparse-10753542-L37600000962888753.
SPARSE_CHANGE: Id68662573ba410db877dac6dfe289224eb75abf7

Change-Id: I65343bf21e73107ceeb33cec56a0a3fe2a92b667