Merge "Add "Unlocked device required" parameter to keys"