Add demo tasks

Change-Id: I72c456a9340d4d602497d74c1137ce7aeaee880c