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

* commit '3cd8ec3c6832ee142e217e2653cce58de3f1dba1':
  Cleanup logic for per-op auth keys.