Made demo changes.

Change-Id: I5c1b067457da585912cd75b016b6e6007bd3d786