Merge "Fix signature for finalize() to resolve API Lint error"