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

Change-Id: I4b91b3b01ef24d43439bbc41bc8acaa7c690522b