Merge "Limit maximum number of concurrent keystore operations."
Shawn Willden authored
am: 108a5d34

* commit '108a5d34':
  Limit maximum number of concurrent keystore operations.
80b09638