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

* commit 'a0fa07a05fcb0ba4914a376abb717fabed3c80b8':