am a1fa7cef: am 1faefa06: Merge "Fix one NPE in tethering setting"

* commit 'a1fa7cef5d88d0f515efa07d0f7274c41fa6d712':
  Fix one NPE in tethering setting