Merge "Fix incorrect text when on Airplane Mode" into qt-qpr1-dev
am: d2469209ea

Change-Id: Ic715ce18c2ae384e4bef7b751f707d74aa7df7a1