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

Change-Id: I7840cc30da45e07e5211cee433ab7bb17ede5149