demo: Make demo console more generic

Change-Id: I171874d50ea383344a206ec0eae9ecb175d39e6c