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

Change-Id: I41258c461f513924563049d553457c58b192abae