ocg use generic::systemuser

Change-Id: I961826d6fb4c49fb5e689047e1987151af01a4b5
Merge "ocg use generic::systemuser" into production