Merge "Update demo mode clock to 8:00 for O." into oc-mr1-dev
am: 66204a42cb

Change-Id: Ibe018c874f24bb9b59ac412133262dfb31104fa6