ocg use generic::systemuser

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