Merge changes I2f3003a7,I0f66cb6a

* changes:
  keystore2: Test case for storing upgraded RKPD key
  Use separate RKPD key IDs in test cases