Merge cherrypicks of ['googleplex-android-review.googlesource.com/23543234', 'googleplex-android-review.googlesource.com/23554146'] into sparse-10316531-L99500000961260703.
SPARSE_CHANGE: I835dd545a01eb2fd7990e0fd5ad51bac0e4b1f33
SPARSE_CHANGE: I2ee30dfa5e4170272b5353f270a69b38750a0bd5

Change-Id: I3e40b22e7022dea212a7d24559dbaaa345874176