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

Change-Id: I21b7f6df6facfcdb547e2aef3d4d8e19492c8e2d