Merge commit '150d5d84e8913e93402950a84ff991b7549b71b4' * commit '150d5d84e8913e93402950a84ff991b7549b71b4': Use the keystore service instead of the direct file access.
Merge commit '150d5d84e8913e93402950a84ff991b7549b71b4' * commit '150d5d84e8913e93402950a84ff991b7549b71b4': Use the keystore service instead of the direct file access.