Merge "Sanitize app op service inputs" into nyc-dev