Merge "Merge "Free up memory in the ZigZagClassifierTest." into qt-dev am:...
Merge "Merge "Free up memory in the ZigZagClassifierTest." into qt-dev am: 0031e00d am: bed6ce5f" into qt-r1-dev-plus-aosp
am: 1944edfc
Change-Id: Iba6aa9ab3de0b5942e079d45fe1f5be98e1a6f7d