Merge "The return and fixing of demo mode" into nyc-dev
am: 8af20ef

* commit '8af20ef6a885a50694805a066f02fc643e80b837':
  The return and fixing of demo mode

Change-Id: I34d6d6dba5797b926a9ce61bd9670ea910f3e7b7