Merge cherrypicks of ['googleplex-android-review.googlesource.com/32027645', 'googleplex-android-review.googlesource.com/32027646'] into sparse-13096125-L88400030010046384.
SPARSE_CHANGE: I18ab82279e67ad0b7b8de509b23e1b7607b1dbbe
SPARSE_CHANGE: Iaf59e34577bed2eba8da30037a77d15e4f4bd690

Change-Id: I3407ec6962285da6cf19434ab89fcf897f3d1555