Merge cherrypicks of ['googleplex-android-review.googlesource.com/31017804'] into sparse-13009785-L02100030009347264.
SPARSE_CHANGE: I737c47c7df87e11608672a4e16eb3e9fd645e487

Change-Id: I9e6b0f39017765f0cd6aa295932aa40962a92f9e