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

Change-Id: I77314a70753675d94c717d62abb40b7d2b42ac11