Merge "Update comment for SUPPORTED_PROPERTY_IDS."