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

* commit '6adb995d8e0177189bf77e9a0f6fce7ded87d993':
  Address HPackedSwitch issues raised after merge