Merge "update_verifier: Handle legacy care_map.txt gracefully." into oc-mr1-dev
am: 71b8103bf1

Change-Id: I2fd922b746db80fed5b4212c70b04de9d54eb0cc