am 2c25fac2: Merge change 8036 into donut

Merge commit '2c25fac23e5daafd62238f4c3dd031e3f4cd76f1'

* commit '2c25fac23e5daafd62238f4c3dd031e3f4cd76f1':
  * Disable compatibility mode for all cases.