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