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

Change-Id: I69f74317756e0d3cf7651aad779006807b60e265