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

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