Merge "Add test for Keystore put overflow" into klp-dev