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