am 10914a23: am 662c326e: Merge "Allow yet another combination of key...
am 10914a23: am 662c326e: Merge "Allow yet another combination of key management options" into klp-dev
* commit '10914a23':
Allow yet another combination of key management options