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

Change-Id: I07c23371a0b47bfb3850de2c2e3140f11db6aa2c