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

Change-Id: Ib4670a8e4685a9f9bd933ccba9878bd59ccb6059