Merge cherrypicks of ['googleplex-android-review.googlesource.com/21693196', 'googleplex-android-review.googlesource.com/22078385'] into sparse-9719927-L02000000959258504.
SPARSE_CHANGE: If9eba1862e49fe31462b8f114b459c21e95d4549
SPARSE_CHANGE: I28a7b0dde48c391e6502ddf9877a7a1e66b7dc7a

Change-Id: I0616ce4a686a482c83e202374efbf3851047d1b8