Merge "Add A1 Policy Type/Policy Types logic from backend This commit do not test...