Merge "Fix crash when exiting the Significant Motion test" into marshmallow-cts-dev
am: 49cb643393

* commit '49cb643393c8badf018650b2706c2999120ff974':
  Fix crash when exiting the Significant Motion test