Removign \'final\' modifiers from FeatureFlags so that then can be overridden
am: c7a49f0574

* commit 'c7a49f05743f377d2299e4ecbc2e396e7afe87c3':
  Removign 'final' modifiers from FeatureFlags so that then can be overridden