Merge "Generalize keystorekey for non odsign use cases"