Merge cherrypicks of ['googleplex-android-review.googlesource.com/27929467'] into sparse-11973172-L31400030004671065.
SPARSE_CHANGE: I0bcd3ba4ad5ee89653447e8119868deec2175a07

Change-Id: I41b523bb538f0fdcd7ea5814822b3bd177f750c2