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

Change-Id: I1f8915547876e0e0045724eb9a1e29123ab4edda