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