Merge "Introduced PRIVATE_FLAG_REQUIRED_FOR_SYSTEM_USER"