Merge cherrypicks of ['googleplex-android-review.googlesource.com/29567686', 'googleplex-android-review.googlesource.com/29567795'] into sparse-12405038-L87300030006651231.
SPARSE_CHANGE: Ieb4a1f35ba5a07cccdba789553d1248f21baa869
SPARSE_CHANGE: I4f5f4ccc3d22d8197d0da2c5231a74ebf3538f61

Change-Id: I349ece5a7faa1e9d59c9137ce60a902596bc39f4