am 4e2eb658: Merge "Update airplane-mode manipulation for the new Settings...
am 4e2eb658: Merge "Update airplane-mode manipulation for the new Settings namespace" into jb-mr1-dev
* commit '4e2eb658':
Update airplane-mode manipulation for the new Settings namespace