catchchanged title from Update two assertions that were incorrect after a cherry-pick. to Update several assertions that were incorrect after a cherry-pick.
changed title from Update two assertions that were incorrect after a cherry-pick. to Update several assertions that were incorrect after a cherry-pick.