Would help if the OCG config was in the right spot

Change-Id: I1c3928b5b41d6d7a0618ce76b6d361c8b6e79419
Merge "Would help if the OCG config was in the right spot" into production