Bug 830287 - Added error for airplane mode and make error be unified under an error matrix
Merge pull request #7928 from lodr/bug-830287-airplane-error

Bug 830287 - Added error for airplane mode and make errors be unified under an error matrix
Cause r+