Merge "Add keystore onUserAdded/Removed methods" into mnc-dev