Merge "Add missing TAG definition TAG_UNLOCKED_DEVICE_REQUIRED"