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

Change-Id: Icb41be437dde0d481dd29c77c113596bef12fb03