Merge "Fix heap-smashing bug in keymaster key encryption."