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

* commit '1faefa06a3a742123af8ea5be5bbfb730db16c7c':
  Fix one NPE in tethering setting