Add a flag to disable the fec data computation am: 72d512c227
am: e5230783f3

Change-Id: If031ceb8254546d9878970f63affaf18b7b3a4d5