Rebase changes from recent demo work.

Signed-off-by: Suchi Raman <suchi.raman@plexxi.com>