am 2cff6ce3: am 4f3dcc85: Revert "Add utility for toggling settings from the cmd line."

Merge commit '2cff6ce39f74ef26a44233fe618b062a783c5f76'

* commit '2cff6ce39f74ef26a44233fe618b062a783c5f76':
  Revert "Add utility for toggling settings from the cmd line."