Merge "Implement keymaster 1.0 import_key method"