Merge changes from topic "presubmit-am-252c19ff01494a57914e67f9f966bbf4"

* changes:
  [automerged blank] Close Cursor before end of test. 2p: fa5cbdb2c0
  Close Cursor before end of test.