Merge "Update aai_keystore and ext pem"