Merge "Fix incorrect keymaster device usage."