am a08e8be7: am 6adb995d: Merge "Address HPackedSwitch issues raised after merge"

* commit 'a08e8be70d88db86062e8ba15a5b7d813f10bb47':
  Address HPackedSwitch issues raised after merge