Merge cherrypicks of ['googleplex-android-review.googlesource.com/26749527', 'googleplex-android-review.googlesource.com/26822671'] into sparse-11677807-L25900030003322658.
SPARSE_CHANGE: I4adff31a3d552c862fab43cba73c0cb074904be8
SPARSE_CHANGE: Ic4cb9fec016661b45d7af9a1075e5912bd435b9e

Change-Id: I136c03095f16ae2b8a377afa97e46cb44391c37f