Merge "Change FinalizeTest to use helper function" into marshmallow-cts-dev am: d0ae2ffcb6 am: 1e6284ec29 am: 762c0d8cc3
am: c547ad05a0

* commit 'c547ad05a040b638ef7d72acf118217d573e9d71':
  Change FinalizeTest to use helper function