Merge "Cleanup logic for per-op auth keys." into mnc-dev