am 5aff893a: am 5ab7187d: am a40916d5: Merge "Size hotseat data structure appropriately." into jb-ub-now-kermit

* commit '5aff893a2366b274e81c1c23e0c2fb266f080873':