am 91725e78: am 3cd8ec3c: Merge "Cleanup logic for per-op auth keys." into mnc-dev

* commit '91725e78647dde14c915e28d96d6c929d1a09b9d':
  Cleanup logic for per-op auth keys.