Merge cherrypicks of ['googleplex-android-review.googlesource.com/25156721'] into sparse-10873617-L38100000963723257.
SPARSE_CHANGE: I856c812d22363cc1d1e8aa88706d4d3b89044f52

Change-Id: I9a978e1c1a1eb2b50382905083ebf22ac41e1918