Merge "Don't lock down system user in demo mode" into oc-dr1-dev am: 4f540fe8d0 am: f3b6768601
am: ff264d07ca

Change-Id: I9b65b7f2e90730895e65b6a8fd76114832458540