Merge "Added FUEL_CONSUMPTION_UNITS_DISTANCE_OVER_VOLUME" into tm-qpr-dev