resurrecting ocg role

Change-Id: I50301b7e12f92f18580128854351bfdcb498ecd0