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

Change-Id: I024b6a4ed2d268b60699f83dc8a1fea2435f794d