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

Change-Id: If25935e8fea1d224f0d6bc504285bfbd8f1b4612