Merge cherrypicks of ['googleplex-android-review.googlesource.com/25221994'] into sparse-11013343-L62600030000019805.
SPARSE_CHANGE: I6d64f7256e99e3519158e62768519107a423723e

Change-Id: I026213be6e118508769b18843979d13e531f0ccf