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

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