Merge "Remove summary of 'Advanced' preference." into oc-mr1-dev