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

Change-Id: I1ad1ee6abafea702d9bb64f45ebad5ea307f25ec