Merge "Add VHAL params for fuel economy and units"