Merge "Update the AID -> UID mapping."