Revert "ocg use generic::systemuser"

This reverts commit 65f7255f600472a79b50e4cf66cf19a7c03e57b6.

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