Merge "Change FinalizeTest to use helper function" am: fb76acff48 am: cf821d5f33
am: 3162830546

* commit '316283054644f2e4423be975000e9be956047722':
  Change FinalizeTest to use helper function