Merge "Minor clean-up in DeviceOrientation and DeviceMotion"