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

* commit '10dc3811c3119667fbb91761099b6b6b9d25cebb':
  Change FinalizeTest to use helper function