Merge "CryptoHal: remove redundant buffer id counter"