Merge "Fix keystore wifi concurrency issue."
am: dece12434d

Change-Id: I96a65c120fa6fe54112400687ee7e9a7578672e8