Merge "Disable NN API HVX service for OC-MR1 release" into oc-mr1-dev