Merge "Use PRC_AUTOPATROLLED for log entries and category entries"