am 15a5bffb: Merge change Ie944f08b into eclair

Merge commit '15a5bffb7efc59895a92e6072717e001d2d9480c' into eclair-plus-aosp

* commit '15a5bffb7efc59895a92e6072717e001d2d9480c':
  Revert setDataEnabled to setting a master switch.