OCG configuration: turn off now-unnecessary transition hack.

Change-Id: I269cb6ddf65ad9205c6139e028da171bbee998d0
Merge "OCG configuration: turn off now-unnecessary transition hack." into production