am db82c9e0: Merge "Fix regression, don\'t NPE if Switch doesn\'t have a thumb set" into lmp-mr1-dev

* commit 'db82c9e00ee9eefab68f6b8fff5db60736583490':
  Fix regression, don't NPE if Switch doesn't have a thumb set