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

* commit '01c07a856de163dc9a6fd31ea4b42293d221ee63':
  Choose CA certificate storage according to userId