am 69ea6665: am af672998: Merge "Fix Settings app crash while enabling tethering" into klp-dev

* commit '69ea666520af496b6cd1c106df727d74be70c491':
  Fix Settings app crash while enabling tethering