Merge commit 'e7e587daf65ec39ca2b10e5c6a03f6bb0b4ccce0' * commit 'e7e587daf65ec39ca2b10e5c6a03f6bb0b4ccce0': Revert "Use the keystore service instead of the direct file acess."
Merge commit 'e7e587daf65ec39ca2b10e5c6a03f6bb0b4ccce0' * commit 'e7e587daf65ec39ca2b10e5c6a03f6bb0b4ccce0': Revert "Use the keystore service instead of the direct file acess."