Merge "Fix keystore wifi concurrency issue."