Fix: files missing from demo and test runner

Change-Id: I783384a28147c9c7cdfdcb6639fea1f197cffb54
Merge "Fix: files missing from demo and test runner"