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

Change-Id: I1d86ea5b69fe9a8bddb29d3e8483cc6a34b3b689