Merge "Touch blocks in care_map in update_verifier" am: 3605a072bc  -s ours
am: 96c3c32b66

Change-Id: I94c50d0c24b1d0d2331b1c5fd117c06542c85533