Merge "Fix keystore wifi concurrency issue." am: dece12434d am: fe8fb1fc2c
am: 9a9794408c

Change-Id: Ic9c42a6876f056f70d25751c9feb2e650f753ac9