Merge "Update string used as summary when an option is disabled by policy."...
Merge "Update string used as summary when an option is disabled by policy." into nyc-dev am: 82f927bd
am: 297b2164
* commit '297b2164':
Update string used as summary when an option is disabled by policy.