Merge commit 'eb7836f11ec4e9753db7c6ecd9414e153bb7bdbe' * commit 'eb7836f11ec4e9753db7c6ecd9414e153bb7bdbe': Apply the new keystore and certtool library in Wifi setting.
Merge commit 'eb7836f11ec4e9753db7c6ecd9414e153bb7bdbe' * commit 'eb7836f11ec4e9753db7c6ecd9414e153bb7bdbe': Apply the new keystore and certtool library in Wifi setting.