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