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