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

* commit '6e645e0e7ee687ababf5700e36b271700580de88':