Merge "Fix refactoring glitch in KeyStore.java" into qt-dev am: 7a2212e7a6
am: 0aeb21d4b7

Change-Id: I149f85bc044888c9a9dd70637502173e54393206