Merge cherrypicks of ['googleplex-android-review.googlesource.com/32875900', 'googleplex-android-review.googlesource.com/34169339'] into sparse-13775243-L92100030014435199.
SPARSE_CHANGE: Ibe8a80d65c4dff6368352944e004c5c934430953
SPARSE_CHANGE: I91c44428dc730be4cf42b3cb9c02e8eca4440f81

Change-Id: I6cb652cecf3a3023532bb17eee275bf66fee250d