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

Change-Id: I8b39471b35d10a6a597eb3a276ea892803c24a09