Updating ocg service to master

Change-Id: I2c1bf75053aaa08bbe727b615f84da145c7ebb65