am bc864b48: Merge "Cipher: iterate through services first"

* commit 'bc864b48689ac9374ec88ab0d8a719666dc8a8e6':
  Cipher: iterate through services first