Merge "Limit maximum number of concurrent keystore operations." am: 108a5d34b5
am: 80b09638de

* commit '80b09638de3571d2c12aa3d6e3d22682fc431b72':
  Limit maximum number of concurrent keystore operations.