Merge "Don't set useAdminDisabledSummary when there is already a summary." into nyc-dev