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

* commit '9548da4b24cc0099033e5040993e8762cac2181e':
  Fix crash when exiting the Significant Motion test