am db9e0a67: am 01c07a85: Merge "Choose CA certificate storage according to userId"

* commit 'db9e0a674ac3a9c71699618cb525fdd3c4669e30':
  Choose CA certificate storage according to userId