Merge "Update demo mode time" into nyc-dev
am: 341e37d349

* commit '341e37d349b001b87a7d66ea3f6a4b4ffdf4f52a':
  Update demo mode time

Change-Id: Ia64c7c33aeaf66ef48f29362c68319b4abcdfdbd