Merge "KeySetManager: change KEYSET_NOT_FOUND to public"