Merge "Cleanup code for HAL based PNO" into oc-mr1-dev