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

Change-Id: I8750814a16e8c3cb98c8c722b2211798b3a7e439