dc6399bcdf
Merge commit '0d039ba328a59fc81280fbecf68aad2d2cba7234' * commit '0d039ba328a59fc81280fbecf68aad2d2cba7234': keystore: Fix a compile warning.