am 66e66e1d: am 755a967b: Merge "Clean up wifi/mobile indicators in the expanded panel." into ics-mr1

* commit '66e66e1d70bdcf184a29bc5eb8cfdeecffdb799f':
  Clean up wifi/mobile indicators in the expanded panel.