am 47e4015b: Merge "Avoid airplane mode labels when Wi-Fi enabled." into ics-mr1

* commit '47e4015ba23c507196980dcb4a311afc7e2358b1':
  Avoid airplane mode labels when Wi-Fi enabled.