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

Change-Id: Ie19a8ebf3f575599a5ed9ddcd80ab99e06f6cf77