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

* commit 'af672998af7fb0bba90f7d56504584a63ff189fa':
  Fix Settings app crash while enabling tethering