Merge commit 'e0b7e916a1259d2dd9c116695607f9877ec56056' * commit 'e0b7e916a1259d2dd9c116695607f9877ec56056': Replace the dummy code with Keystore for <keygen> support.
Merge commit 'e0b7e916a1259d2dd9c116695607f9877ec56056' * commit 'e0b7e916a1259d2dd9c116695607f9877ec56056': Replace the dummy code with Keystore for <keygen> support.