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

* commit '7500cf9df3b74cbc53c5afa30d200a434eca116e':
  Fix crash when exiting the Significant Motion test