Merge "Fix keyguard/Keystore storage issue" into klp-dev