Merge "Update api docs to reflect the most recent changes to policytypes"