Merge "Update comments for security type in AccessPoint"