Merge "Persist wifi override in airplane mode" into honeycomb-mr1