Ensure that hotseat callout only occurs when appropriate

issue 13551957

Change-Id: I87bda7eef8047edbd41f066930ed156a17d042df
2 files changed