Merge cherrypicks of ['googleplex-android-review.googlesource.com/31144159'] into sparse-12859276-L54700030008882237.
SPARSE_CHANGE: I25614ead889501f4553ed2b42b366e09a47b0c9f

Change-Id: I8c074a233032eed7f6b0423830d244e0e71fcff4