FUEL enabled

Change-Id: I441f425b3a1cc319673fc4ccb9cbb5c94bd75bdc
Merge "FUEL enabled"