am 8847fd85: Merge "Merge commit \'c3563eb9\' into honeycomb-plus-aosp" into honeycomb-plus-aosp

* commit '8847fd8532c12c8d3cf7f68e0313141b6f877434':
  Fix getSwitchState.