Merge "Clean up demo dir when leaving demo mode" into nyc-mr1-dev am: 2c5cbd4012
am: 0ebf3cc47c

* commit '0ebf3cc47c9d20613f02ca263a2394d80455a09a':
  Clean up demo dir when leaving demo mode

Change-Id: Ib3338a18e75f04e15a1d77a82e5ac1aba246a5bb