Merge "Add an uncalibrated accelerometer type."