Merge cherrypicks of ['googleplex-android-review.googlesource.com/23543234'] into sparse-10231374-L75200000961052022.
SPARSE_CHANGE: I835dd545a01eb2fd7990e0fd5ad51bac0e4b1f33

Change-Id: I9316eec596fb59d53a37471da1a44cf96a49cdd1