Merge "Remove Obsolete Keystore test." into pie-cts-dev