Merge changes from topic "EnableAirplaneModeInSafeMode" am: f0f0606365 am: a5ea8bf766
am: 83b09c7f40

Change-Id: I78eb71ce8e5c95416ada6970ed7cec0d2a806d47