Do not include and declare the OCG class

Change-Id: Ifc0134a96dfc7fb3450a77b30e3edf06b5fcb4c1
Merge "Do not include and declare the OCG class" into production