Matching hotseat to spec.
am: 6231ede10c

Change-Id: Ie24c19e89738518e398f466f22ae4d284733dc43