Merge "Cleanup Keystore API" into mnc-dev