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

Change-Id: I2213eed088cee42f25add6fd15fcaca97ba017a7