Revert "Disable parameterization in NMSTest" This reverts commit 3e7aee97926d34dfb63e5cda5e8fecc03be4b8e8. Reason for revert: Wasn't the culprit, let's try adding it again Change-Id: Ic9245d839d2e1cf2dc74dcb6d797c8e70f91565f