Merge "Change field type for reverse" into rvc-d1-dev

    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);

    private final EnhancedEstimates mEstimates;

    private final BroadcastDispatcher mBroadcastDispatcher;

    protected final BroadcastDispatcher mBroadcastDispatcher;

    protected final ArrayList<BatteryController.BatteryStateChangeCallback>

            mChangeCallbacks = new ArrayList<>();

    private final ArrayList<EstimateFetchCompletion> mFetchCallbacks = new ArrayList<>();