Merge "Free up memory in the ZigZagClassifierTest." into qt-dev am: 0031e00da6
am: 95980038f2

Change-Id: I2033b31e05e39e845a6b4d5f213cd1ccc5596b54