Make the trigger demo kind of work again

Or at least make it not explode in a hellacious ball of fire.

Change-Id: I5923b57eff5be4f8c945adac7dd8f62d6f13955b
Merge "Make the trigger demo kind of work again"